gdk: do not fallback to event->xany.window in GdkEventTranslator
authorCarlos Garnacho <carlosg@gnome.org>
Fri, 20 May 2011 20:17:03 +0000 (22:17 +0200)
committerCarlos Garnacho <carlosg@gnome.org>
Fri, 27 May 2011 09:53:04 +0000 (11:53 +0200)
This is already done in gdk_event_source_get_filter_window(), and
could lead to wrong event assignment if an event translator happens
to return a window for an event it doesn't handle.

gdk/x11/gdkeventtranslator.c

index 4589b1d802fe01a0451414fec4ee3a3be2cb5ced..3b75948f60ee53f4a671c8ee66586c7b94a546ae 100644 (file)
@@ -94,17 +94,13 @@ _gdk_x11_event_translator_get_window (GdkEventTranslator *translator,
                                       XEvent             *xevent)
 {
   GdkEventTranslatorIface *iface;
-  GdkWindow *window = NULL;
 
   g_return_val_if_fail (GDK_IS_EVENT_TRANSLATOR (translator), NULL);
 
   iface = GDK_EVENT_TRANSLATOR_GET_IFACE (translator);
 
   if (iface->get_window)
-    window = iface->get_window (translator, xevent);
+    return iface->get_window (translator, xevent);
 
-  if (!window)
-    window = gdk_x11_window_lookup_for_display (display, xevent->xany.window);
-
-  return window;
+  return NULL;
 }